From 380485a5e895ba51b8d4443059d3f0ceab5c13d6 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Wed, 27 Sep 2006 14:30:36 +0100 Subject: [PATCH] [XM-TEST] Remove the test for /dev/tpm0, which may be a prerequisite to start the vtpm_manager. A 'SKIP' is shown if the vtpm_manager process has not been started. Signed-off-by: Stefan Berger --- tools/xm-test/tests/vtpm/vtpm_utils.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py index 01a60f90c6..0af46574c9 100644 --- a/tools/xm-test/tests/vtpm/vtpm_utils.py +++ b/tools/xm-test/tests/vtpm/vtpm_utils.py @@ -8,12 +8,10 @@ from XmTestLib import * if ENABLE_HVM_SUPPORT: SKIP("vtpm tests not supported for HVM domains") -if not os.path.exists("/dev/tpm0"): - SKIP("This machine has no hardware TPM; cannot run this test") - status, output = traceCommand("ps aux | grep vtpm_manager | grep -v grep") if output == "": - FAIL("virtual TPM manager must be started to run this test") + SKIP("virtual TPM manager must be started to run this test; might " + "need /dev/tpm0") def vtpm_cleanup(domName): traceCommand("/etc/xen/scripts/vtpm-delete %s" % domName) -- 2.30.2